ixp/interrupts: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile
index 7e98d870261918f866c2e57306fc8f95689e1d8b..a673cb1b9fc3a7c6f5bc46f4ce3e4ee503a0603d 100644 (file)
--- a/cpu/ixp/Makefile
+++ b/cpu/ixp/Makefile
@@ -27,9 +27,10 @@ LIB  = $(obj)lib$(CPU).a
 
 START  = start.o
 COBJS-y        += cpu.o
-COBJS-y        += interrupts.o
 ifndef CONFIG_USE_IRQ
 COBJS-y        += timer.o
+else
+COBJS-y        += interrupts.o
 endif
 
 SRCS   := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)

diff --git a/cpu/ixp/interrupts.c b/cpu/ixp/interrupts.c
index 621f31b00f7c620915b060fd1753c64628c2e883..ee0129ead3f8f1bbaa2952244e98f14df717afce 100644 (file)
--- a/cpu/ixp/interrupts.c
+++ b/cpu/ixp/interrupts.c
@@ -31,8 +31,6 @@
 
 #include <common.h>
 #include <asm/arch/ixp425.h>
-
-#ifdef CONFIG_USE_IRQ
 #include <asm/proc-armv/ptrace.h>
 
 /*
@@ -85,20 +83,15 @@ void reset_timer (void)
        timestamp = 0;
 }
 
-#endif /* #ifdef CONFIG_USE_IRQ */
-
-#ifdef CONFIG_USE_IRQ
 void do_irq (struct pt_regs *pt_regs)
 {
        int irq = next_irq();
 
        IRQ_HANDLER[irq].m_func(IRQ_HANDLER[irq].m_data);
 }
-#endif
 
 int interrupt_init (void)
 {
-#ifdef CONFIG_USE_IRQ
        int i;
 
        /* install default interrupt handlers */
@@ -119,7 +112,6 @@ int interrupt_init (void)
 
        /* enable timer irq */
        *IXP425_ICMR = (1 << IXP425_TIMER_2_IRQ);
-#endif
 
        return (0);
 }